From 0d1fa649fe49417975f1fb9c51efc35944532a13 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 9 Jan 2009 13:00:10 +0000 Subject: [PATCH] hvmloader: MTRR UC type covers the pci regions only. Signed-off-by: Keir Fraser --- tools/firmware/hvmloader/cacheattr.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/tools/firmware/hvmloader/cacheattr.c b/tools/firmware/hvmloader/cacheattr.c index fb6e9f4480..ae23b3e159 100644 --- a/tools/firmware/hvmloader/cacheattr.c +++ b/tools/firmware/hvmloader/cacheattr.c @@ -88,13 +88,25 @@ void cacheattr_init(void) nr_var_ranges = (uint8_t)mtrr_cap; if ( nr_var_ranges != 0 ) { - /* A single UC range covering PCI space. */ - /* pci_mem_start must be of the binary form 1....10....0 */ - BUG_ON(~(pci_mem_start | (pci_mem_start - 1))); - wrmsr(MSR_MTRRphysBase(0), pci_mem_start); - wrmsr(MSR_MTRRphysMask(0), - ((uint64_t)(int32_t)pci_mem_start & addr_mask) | (1u << 11)); - printf("var MTRRs ... "); + unsigned long base = pci_mem_start, size; + int i; + + for ( i = 0; (base != pci_mem_end) && (i < nr_var_ranges); i++ ) + { + size = PAGE_SIZE; + while ( !(base & size) ) + size <<= 1; + while ( ((base + size) < base) || ((base + size) > pci_mem_end) ) + size >>= 1; + + wrmsr(MSR_MTRRphysBase(i), base); + wrmsr(MSR_MTRRphysMask(i), + (~(uint64_t)(size-1) & addr_mask) | (1u << 11)); + + base += size; + } + + printf("var MTRRs [%d/%d] ... ", i, nr_var_ranges); } wrmsr(MSR_MTRRdefType, mtrr_def); -- 2.30.2